Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix custom cookies example #9321

Merged
merged 1 commit into from
Sep 28, 2024
Merged

Fix custom cookies example #9321

merged 1 commit into from
Sep 28, 2024

Conversation

Dreamsorcerer
Copy link
Member

Fixes #7121.

@Dreamsorcerer Dreamsorcerer added bot:chronographer:skip This PR does not need to include a change note backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Sep 27, 2024
Copy link

codecov bot commented Sep 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.56%. Comparing base (e402833) to head (9c790d8).
Report is 18 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9321   +/-   ##
=======================================
  Coverage   98.56%   98.56%           
=======================================
  Files         107      107           
  Lines       34896    34896           
  Branches     4135     4135           
=======================================
  Hits        34395    34395           
  Misses        334      334           
  Partials      167      167           
Flag Coverage Δ
CI-GHA 98.45% <ø> (ø)
OS-Linux 98.11% <ø> (ø)
OS-Windows 96.52% <ø> (ø)
OS-macOS 97.80% <ø> (+<0.01%) ⬆️
Py-3.10.11 96.20% <ø> (-1.59%) ⬇️
Py-3.10.15 97.71% <ø> (ø)
Py-3.11.10 97.67% <ø> (ø)
Py-3.11.9 97.74% <ø> (-0.02%) ⬇️
Py-3.12.6 98.17% <ø> (ø)
Py-3.13.0-rc.2 98.15% <ø> (ø)
Py-3.9.13 97.67% <ø> (ø)
Py-3.9.20 97.61% <ø> (ø)
Py-pypy7.3.16 97.23% <ø> (-0.01%) ⬇️
VM-macos 97.80% <ø> (+<0.01%) ⬆️
VM-ubuntu 98.11% <ø> (ø)
VM-windows 96.52% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Dreamsorcerer Dreamsorcerer merged commit a4b148e into master Sep 28, 2024
41 of 42 checks passed
@Dreamsorcerer Dreamsorcerer deleted the Dreamsorcerer-patch-1 branch September 28, 2024 00:58
Copy link
Contributor

patchback bot commented Sep 28, 2024

Backport to 3.10: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply a4b148e on top of patchback/backports/3.10/a4b148e84dacfaac3b17c6cb5f5ca3025b0e4914/pr-9321

Backporting merged PR #9321 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.10/a4b148e84dacfaac3b17c6cb5f5ca3025b0e4914/pr-9321 upstream/3.10
  4. Now, cherry-pick PR Fix custom cookies example #9321 contents into that branch:
    $ git cherry-pick -x a4b148e84dacfaac3b17c6cb5f5ca3025b0e4914
    If it'll yell at you with something like fatal: Commit a4b148e84dacfaac3b17c6cb5f5ca3025b0e4914 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x a4b148e84dacfaac3b17c6cb5f5ca3025b0e4914
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix custom cookies example #9321 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/a4b148e84dacfaac3b17c6cb5f5ca3025b0e4914/pr-9321
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link
Contributor

patchback bot commented Sep 28, 2024

Backport to 3.11: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply a4b148e on top of patchback/backports/3.11/a4b148e84dacfaac3b17c6cb5f5ca3025b0e4914/pr-9321

Backporting merged PR #9321 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.11/a4b148e84dacfaac3b17c6cb5f5ca3025b0e4914/pr-9321 upstream/3.11
  4. Now, cherry-pick PR Fix custom cookies example #9321 contents into that branch:
    $ git cherry-pick -x a4b148e84dacfaac3b17c6cb5f5ca3025b0e4914
    If it'll yell at you with something like fatal: Commit a4b148e84dacfaac3b17c6cb5f5ca3025b0e4914 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x a4b148e84dacfaac3b17c6cb5f5ca3025b0e4914
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix custom cookies example #9321 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/a4b148e84dacfaac3b17c6cb5f5ca3025b0e4914/pr-9321
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Dreamsorcerer added a commit that referenced this pull request Sep 28, 2024
(cherry picked from commit a4b148e)
Dreamsorcerer added a commit that referenced this pull request Sep 28, 2024
(cherry picked from commit a4b148e)
Dreamsorcerer added a commit that referenced this pull request Sep 28, 2024
Dreamsorcerer added a commit that referenced this pull request Sep 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot bot:chronographer:skip This PR does not need to include a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

filter_cookies only acceps URL and not string
1 participant